Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410

Make sure image types are initialized for lookup too

diff --git a/src/ChangeLog b/src/ChangeLog
index 8d29cf2f08d30a98b5a1271072ecfdf1d4d672c0..368b1d34a2a75d10d77fbcea2cb52f85bdc69249 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Miles Bader  <miles@gnu.org>
+
+       * image.c (lookup_image_type): Initialize image type if necessary.
+
 2004-06-15  Kim F. Storm  <storm@cua.dk>
 
        * xdisp.c (try_cursor_movement): Exclude header line from scroll

diff --git a/src/image.c b/src/image.c
index 3eccf0f001e2ca3b19507b63655b3c2fd960ddfc..438e132807fb7106ee3b3d82d0dda5e7c76875ca 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -689,6 +689,10 @@ lookup_image_type (symbol)
 {
   struct image_type *type;
 
+  /* We must initialize the image-type if it hasn't been already.  */
+  if (NILP (Finit_image_library (symbol)))
+    return 0;                  /* unimplemented */
+
   for (type = image_types; type; type = type->next)
     if (EQ (symbol, *type->type))
       break;